tools/xenconsoled: Fix file handle leaks

Coverity ID: 715218 1055876 1055877

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 250550a612bd954f666fce4102e4618f67b4d382..007ecf41c384770e327e4121275bfec871b741d4 100644 (file)
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -278,6 +278,7 @@ static int create_hv_log(void)
                        dolog(LOG_ERR, "Failed to log opening timestamp "
                                       "in %s: %d (%s)", logfile, errno,
                                       strerror(errno));
+                       close(fd);
                        return -1;
                }
        }
@@ -323,6 +324,7 @@ static int create_domain_log(struct domain *dom)
                        dolog(LOG_ERR, "Failed to log opening timestamp "
                                       "in %s: %d (%s)", logfile, errno,
                                       strerror(errno));
+                       close(fd);
                        return -1;
                }
        }

diff --git a/tools/console/daemon/utils.c b/tools/console/daemon/utils.c
index aab6f425e8edb3023c650d6c863f22ab8a63102d..71dd185b8e0cf26e1aae101486988489827f8267 100644 (file)
--- a/tools/console/daemon/utils.c
+++ b/tools/console/daemon/utils.c
@@ -104,6 +104,7 @@ void daemonize(const char *pidfile)
        signal(SIGTSTP, SIG_IGN);
        signal(SIGTTOU, SIG_IGN);
        signal(SIGTTIN, SIG_IGN);
+       close(fd);
 }
 
 bool xen_setup(void)